Added users to the model
Refacoted tests
Some refactor in rest
Added users to REST