add default_collector
reorg tests