Add model visitor, and allow bundles to have categories (as allowed in the spec)
Fix unit test failure