refactor tests
tests fixed