fixes for test fails