Changed tests to use xunit