fixed remaining tests