Updated functional tests.