Fix unit tests; Devise adds an email field