Further additions to user model. Started some basic should matcher tests...

... for user model