more test updates to make debugging easier
generate new-style datacollection config