Add New environment classes
Server test