merged with refactoring changes
Merge branch 'adminControllerTesting' of https://github.com/Daria-Sakura/Super-Med-Service into adminControllerTesting