Fixed extraction parsing; fixed various tests