Fixing some tests and getting the basis for adding more Admin tests setup in the future.