Misc careplan QA changes

See individual commits for unit changes