BUG: fix functional test suite.