t4_comment: Reorganization of test containers