Updating matchers, fixing a small issue travis is hitting I hope.