Fix and add Mach0 tests