JC-1497 Added comments. Renamed tests.
Merge remote-tracking branch 'origin/master'