* Clearup code.
* Added tests for CategoryCollection.