Making changes to get the tests to run.