Move towards XUnit and Spec.TestSupport

OK