Tests enviroment improvements