Update the mocks
Lots of tests and fixes
Merge branch 'master' into deanh/fix
Correct parent with bugfixes