Updated tests to M6