Rewrite specs to use custom matcher