fix all test errors. Standard Simplification works now