fix all tests with new arithmetic and comparer rules