Improvements to test suite