Added some more waits in testcase for jenkins