Added timeout checks to remaining matchers