Re-categorizing. Updating tests.