User Auth testing and enforcing passwordDigest during tests
fixed merge conflicts