Remove sorted assumption from 2i tests

Also, pick up some streaming parsing fixes from 2.0