Touching up, increasing code coverage
Fixing reporter