Added all tests for categorical