WIP: mo test tweaks - fixup with prev commits