Add back a bit of parallelization to parsing, fix failing test