* fixed remaining test failures