Added last 'User' methods and unit tests