cleaned up xunit class