fixed remaining test failures