More mach0 test fixes