JUnit test, Named Queries in XML file, Comment update and refactoring.