KFSCNTRB-1781 - Cleaning up JUnit for comments and formatting.