Migrated to the custom build of xunit