users and tests mostly working
more tests