Issue #253: Fix failing admin menu tests.
Merge pull request #304 from quicksketch/fix-admin-menu

Issue #253: Fix failing admin menu tests.