some more fixes for the test suite