Document and test categories (#2923)