Updates matchers for RSpec3 syntax

WIP, not sure why so many tests are failing.