Itests improvements