3 tests fixed