#6 tests fixed