More work on stream testing, fixed bug with differently-ordered edits.