Fix tests for MBRA. MBRA UI is still broken by HEAD, though.