Cover deployments explosion case better in tests

When cfn explodes deployments we end up with many things stored per
collector, so some assumptions around 1:1 collector to cached content
cannot be made anymore.

Change-Id: I43c5fb759bc99690e0def1c6ecb672ab7f087df8