more fixes
Fixed random account creation.
Merge remote-tracking branch 'project/master' into change
Updated classes