Tests for m1-m3 reworked