ticket:5 tests fixed and updated