Update tests slightly; cope with multiple providers for Check.