Fixed uncategorized and commitment being displayed where they were not supposed to.

Removed some unused imports from testing files.