Merge "Cleanup functest.yml"