users model testing
fixed schema merge conflicts