Further m&b testing tweaks