Update the test to not be order sensitive for EC2