FIXED JENKINS-22005

- FIXED JENKINS-22005
- Adding Manual Condition Test Cases and making a few changes for supporting them.