Update the test to not depend on ordering, fix travis