test_controlpanel_markup and test_bbb_markup now passing