Adding test suite setup and comments
Adding missing fields
Completing Site specs
Merge branch 'develop'