fixing remaining test failures