Support collector filter and add some tests