Shortened define-op to op
Reorganized unit tests