#5 tests fixed