Fixed server side tests so that they work with changes that were made to the User constructor
Merge branch 'master' of https://github.com/jasonpharder/notes-n-things