Merge branch 'hotfix/fix_admin_api'
fix: add api admin test, refactoring api admin
Merge branch 'hotfix/fix_api_admin_and_api_test' into develop