Made change to use pre generated uuid in tests - TRUNK-3652