Refactor (ci): Rearrange and add missing variables in test .env files

Refactor (ci): Rearrange and add missing variables in test .env files #525