(test) more fixes towards docgen cases working