Fix integration tests

Change-Id: I758f584102fbe3c5f00055bf18fa12c987345372