complete spec updates for RSpec 3 using only :expect syntax