Added xunit extensions
Added more covering tests
Formatting