Wrap up test boilerplate better.