mstest replaced by xunit and start of refactor for issue #12