Users tests
Merged, updated user tests