Reverted uuid logic to work across multiple tests.