have matcher renamed to contain and contain_only