More test suite improvements