Rearrange test to try to avoid Travis flakiness.