Fix the functional tests.