Fixed tests to account for password digest rather than password hash. Ad...

...justed these things in the models as well