Make check plugins decent

fixes #7242