Minor changes for Loop tests
Solve conflicts merging with integration-v2.0
Merge pull request #514 from owdqa/feature/loop_tests

Minor changes for Loop tests