updated test data generator + user model for ndb