probably fixed remaining tests