Minor clean up to matchers
Hook matchers into RSpec
Add tests for expectation matchers