Add all matchers from previous version with specs