Swapped where method for find
Commented out email confirmation tests temporarily