Small fixes to UnfoldTests