Categorical: Fix unittests