Added tests and categorization interfaces.