Reorganise more python2 / python3 test suites

See merge request !1249
4 jobs for 1.0
in 0 seconds, using 0 compute credits, and was queued for 0 seconds