test suite improvements