Added jacoco plugin and tried reaching better percentages of coverage.
Modified files as per review comments from phill