Tests: More test fixes.