WIP Adding integration tests

Change-Id: I5551510a3090ebe7e974169d072695f55f213262