Make the test setup cleaner.