Break out admin handlers and tests