[DO NOT MERGE] Move towards XUnit and Spec.TestSupport