Add user management
Remove tests