Env settings and TDD ready
Merge conflicts