HCOLL-22 refactored the test cases to make the simpler ( work still in progress )