Add basic users stuff
Improve tests