Updated rspec and changed all shoulds to is_expecteds