allow setup with test flag to use eg. diff collections for testing
some additions