Fixed tests, removed CountFeaturizer