Added support for test users
Real edmond's implementation
Update user support