Fix .env population instructions [skip ci]
Fix sort order issues in tests