add test for password(user model)
merge with thamself(trouble with --amend)