refactored; testing Users api