More TestCollapse simplification....