Look at refactoring tests

[kennethlove]

Our tests seem a little overly complicated. We should make sure they're as easy to write as possible.

Maybe we should have a "how to write a test" guide