Phase 2 of parse engine rewrite: 16 tests fail