Cleaning up the tests to get rid of a ton of repeated code.