Cleanup test suite a little bit.