Add tests for operator simplification.
Fix bug in Minus simplification.