Improve Users tests