ocp: start with some testing for the OCP merge unit