Updating to new xunit
Missed file
Made changes based on comments and added a test
Minor changes