Cleaning up the tests to increase code coverage.
Removing unused code.