Fix broken previous functional tests