Added user tests.  LDAP set_attributes now only runs for LDAP users.  set_attributes runs automatically only on user creation.
Resolved merge conflict with users model.