Fix issue #2, 'Add integration test'

Change-Id: I3c3d0932d78700511bfc7d179af04d28fb845855