Issue #2237737 by eshta: separate out administration tests.