Refactored construction of site definition for tests to be more robust. Also updated MSpec and changed assertion library