Updating tests to use official xunit