Add context matchers for DRY
Add before hook to the spec
Add final remix of search spec