Changed to use newer RSpec expect syntax