re #9298; - tests fix,phpdoc, replace creating category to abstract class