Merge "Revert "OMS: add tests for the OMS transactional API""