Further work on functional tests.