Further fixes to move to a newer xunit version.