Changes in testcases for CI