Merge "typo xtesting->functest"