Fix test articles, reorganize
Fix test articles, reorganize

jeanmask/opps,opps/opps,jeanmask/opps,jeanmask/opps,YACOWS/opps,opps/opps,williamroot/opps,williamroot/opps,YACOWS/opps,YACOWS/opps,williamroot/opps,jeanmask/opps,opps/opps,opps/opps,YACOWS/opps,williamroot/opps