Restructure the tests here to be cleaner.