Refactored admin generics
Fixed tests for admin users list