Rework to not do random version selection within the test