Upgrading functional tests: first attempt