Modify builders to work with env variables only, some tests added