last changes to tests