Added tests and finished the stubs in User