Bring this back with new contain matchers.
Got all the old *ContainMatcher* tests to run again.