Fixing functional tests.