Added unit tests and naming fixes on some of the categories.