Update tests for last changes