WL-2371 Tidyups from code review.

JavaDoc typo corrections.
Unused imports removed.
Incorrect term label fixed.
Comments added to tests.