fix extraction tests.
Merge branch 'clinton-hall/dev-ech'