fixed some problems with the test suite