More admin tests, general polish