Cleanup of conditions and some more test cases#399

aneeshd merged 2 commits intomainaneeshd/schedule_state:mainfrom

devaneeshd/schedule_state:devCopy head branch name to clipboard