Moved custom matchers out of lib and into spec/support