Added tests for watertight folds; they don't all pass yet