#328110 by marcingy, Damien Tournoud, swentel, and pwolanin: Fix error on admin/build/menu, and robustify the test so we catch stuff like this in the future.