Improved fixtures
Merge branch 'master' of https://github.com/eHealthAfrica/swiss-knife