fixed tests after json
Merge branch 'master' of https://github.com/scott-thomson/carers