Made environment a singleton class and test for cells