tests2: rework 117..119 to follow our conventions