More test-related changes