PLFCLD-53 tests fixed; cleanup, updates of javadoc and formatting