Update with the last M5 syntax and move test classes