48265901 Refactoring to make writing tests a bit cleaner. Factories are
now in their own module and there is a common base TestCase.
48265901 More relationships added to round out the Control class. Added
scoping on categories for "Categorizable" classes.