Refactor tests

Nothing fancy here, reduced verbosity in some of the tests, increase use of .build to reduce DB hits and some minor style changes.

Updated based on feedback from @eviltrout and @samsaffron