Upgrading functional tests: second attempt