Can we move this to the test code and keep the class clean?