Created server test and user object
fixed merge conflicts