HCOLL-92 minor formatting changes, comments and a few extra test cases.