More test-fixing