clean up the tests to be a bit nicer to read.