refactoring tests
moar refactorsings