fixing up the test suite