Merge "Update functest to fix failing tests"