Updated dependecies, folded in specs, factored out custom matchers

- current spec status: 840 examples, 0 failures
Removed deprecated matchers and related specs

- current spec status: 691 examples, 0 failures