Finished refactoring of tests, but I'm still repeating myself. :(