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

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