unit tests refactored
cleanup