Admin Functional Tests

+ Additional refactorings