improve functional tests

No match.