Getting rid of RSpec expectation syntax - turned out to be very problematic.