Enable Unit Test Rules
Merge branch 'MyWorkingBranch' into EnableUnitTestRules
Update unit tests and pom file to support new rules