Switch over to promise-matchers