Reverted back to previous approach for more tests.