Removed redundant class and configured to give full unit and integration test coverage for Sonar, via the Jacoco plugin