improved test enviroment