Adding back in OMV based tests which were removed in last PR