Refactored some tests. I do hope that it's not a rule that I have twice as many lines of code for tests than I do for implementation\!