updated tests and fixed bug I created [Finishes: #75231202]
Merge branch 'master' of https://github.com/cbitstech/stepped_care_reboot