Some additions to test enviroment. New class hierarchy for entities.