Shaped up collectors.
Improved test readability. And added test.