Refactoring tests to keep my sanity