refactoring tests to see what works