Fixed environment class.
Separated test.