Merge pull request #1654 from alexanderkyte/xunit-fixes