[tests] Make autotests pass again