refactor cucumber yelp tests and refactor model to deal with invalid information