WIP. Fixed a lot of tests. Env vars appearing in building process