Fixed autotests