Fix automated tests