dry up integration tests

there is still more to do / travis controller test is completely different, but that's the direction I want to take it,
looking good ?

@steved555 @pswadi-zendesk @bolddane @dasch