Add tests for collector