Add integration tests This increases line coverage from 50% to 85%. Change-Id: I8ea9e96cba9feb4b2278c1d030bdad280ae873ae