Fixed the functional tests.