Update docs, tests for environments