Yet another bug fix for edge collapse

* actually, more of an omission
* prevent collapse where non-manifold edge would be created
* update edge collapse tests