Add tests for op soundness; Fix #6