Further bug fixes, data structure collapsing now works properly (I think), more advanced tests