Change the samples to match the new matchers