Fixed 2 build errors: Implement missing members in unit test; Refactored usage of operation types