Update the mocks
Lots of tests and fixes
Ungh. Checkpoint. It looks like my last bactch of changes in api-libraries didn't get merged before I forked into this new repo; the OSS one is missing a lot of bugfixes
Merge branch 'master' into deanh/fix
Correct parent with bugfixes
Merge pull request #2 from openaura/deanh/fix

Deanh/fix