Merge "fix functest-xtesting -> xtesting"