Added our tests to the feature extractor test class (removed from FeatureExtractor)