small refactor of tests for cleanliness