Start removing some of the boilerplate around tests.