Fixes to simplify() helper
simplify() helper tests