Resolved some issues with naming of unit test files and categories