Finished environment passing feature and added test cases to get back to 100% coverage.