pushed fixes for test failures