made changes to rectify issues identified during test
Merge branch 'master' of https://github.com/BaobabHealthTrust/bart2