Fixed some broken functional tests.