Renamed NUnit.org to NUnit
Missed h in the namespace
Reverted most test back to using xUnit, only Scenario is using NUnit and is depended on the new NUnitAddin.