Make some of the unit tests more specific
Add the categories to the output
Add the categories to the output