integration test updates

Change-Id: I1e65cafce5e764ed071c4ffe6cb2e95284bb9b5a
10 files changed