Update the tests to be cleaner