Fix for multiple collapses with right commit
Add another test case related to multiple collapses
Fix last collapse bug