Updating to new xunit

@muratg  @victorhurdugaci 
rename `s` to something more descriptive