Fix broken functional tests