switching to dynamic user model
adjusting templates and tests