[BUGFIX] Fix broken functional tests