Operations now don't convert to canonical form. Tests simplified.