Unit test framework cleanup, minor refactoring & enhanced comments. Removed a few surefire settings which are not needed.