Added supporting unit tests and moved (back) to xunit