Removed some things that were not in the scope of the tests.