fixes for the tests