HCOLL-231 Add another test to show it works.
Merge remote-tracking branch 'origin/master'