structure refactored
tests refactored
empty test removed