Merge pull request #6804 from remitamine/xuite-tests