more test cases to improve the coverage of extractors, and corresponding fixes to pass these tests