Phase 2 of parse engine rewrite: 9 tests fail