2 tests fixed