Fix functional tests.