Refactored construction of site definition for tests to be more robust. Also updated MSpec and changed assertion library
Merge pull request #1 from nicklasisraelsson/develop

Refactored construction of site definition for tests to be more robust. ...