Update tests to a more natural language. Move boilerplate to bottom of tests.