Added some tests + adjusted user update() function