Correct test error by adding OrganizationalStructure to Site
Merge remote-tracking branch 'origin/master'