Added unit tests for Category (and, indirectly, CategoryImpl).  Updated and refactored Container and Containable unit tests.