Small further cleanups of ma.tests, plus correction for python3