update matchers to avoid deprecation warnings