Renamed some tests + removed unused code pointed out by code coverage.