Use correct TypeSafeMatcher class rather than deprecated one