A few more tests converted to xunit