Updating UserId model
Minor fix to tests and addressing code review comment
Removing extra using statement
Merge pull request #23 from MSOpenTech/userid

Updating UserId model