Rename, Add test for FindUserByEmail