Adding more test cases to fix AIRAVATA-1011