better unit tests
tests refactors