Refs #6786  Fix tests