Change to matchers due deprecation warning