Tests for User class
Merge branch 'master' into marko