Refactored AdminController
Refactored Tests to new classes.