Minor tweaks and improvements
2D unfoldTests, and small bug fixes