split out admin layout and update tests for it