Merge pull request #69303 from MattyWilliams22/ec-omap-tests-improved

test: Improve efficiency of omap tests

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Alex Ainscow <aainscow@uk.ibm.com>

Reviewed-by: Bill Scales <bill_scales@uk.ibm.com>