Phase 2 of parse engine rewrite: 7 tests fail