Adding admin tests
Improvements to the testing setup