Add integration tests

Change-Id: Ic33378ea58ea4b90a579c69ea840709e31d07e99
Merge "Add integration tests"