Clean tests

![Clean All The Things](http://www.ifyourbodycouldtalkblog.com/wp-content/uploads/2014/03/clean-all-the-things.jpg)

DRYs up various tests and adds `testthatsomemore`.