Fix missed returns
Add specs for haveType, havePath and includes matchers