JC-1817 Small unit test refactoring. add comments to make them more readable.