fixed test failures
fixed remaining test failure