fixes for test failures