Updated tests
last changes