Updated feature extractors
Initial scripts for test