JC-1699  All cases merged to base line and test plan tests.