add Devise, refactor tests, for Kevin to review broken tests