Split concerns of mock type and collection type

Split concerns of mock type and collection type in the integration tests