Refactor controller to use Test service
Merge branch 'refactoring-admin' into develop