Added additional skip checking for train and pickle tests