CFY-661 fixed unit tests
Merge branch 'develop' into feature/CFY-768-reduce-plan-size