Cleaner tests and cleaner arithmetic ops.