Added global_collapse and single_cell tests.
Remerge with work on non-debug version.