Merge "Additional mock tests for vROPs plugin"