Added updating user.
Added some TODOs
Improved add test
Added some TODOs