Updated unit tests to reflect changes to API schema
Merging from origin
git issues
Merge branch 'Stuff'
Merge branch 'master' into stuff