fix tests, add stuff to extract jc