#9 tests fixed