fixed remaining test...