Merge "Epic-231 cbr junit testcase of SDNC-263"