Tweaks for m&b testing hijinks