Complete multi-collapse
Add test cases for collapse and multi-collapse
More mini test functions