Migration to new integration tests

Change-Id: I31d5bf61f4bc452a7968b09838fc9521bc23dc75
Merge "Migration to new integration tests"