refactored integration tests
Signed-off-by: David Goldberg <david.goldberg@contextream.com>

Change-Id: I205cf06a074cd3bf8fd3338e270c50571dcac6e0
Signed-off-by: David Goldberg <david.goldberg@contextream.com>