adding cleanup to featre tests