extractor tests + bug fix