Corrected category-parameter handling. Modified tests.