Update m.[a-f] where necessary
Add test for correct m.[a-f] values