Phase 2 of parse engine rewrite: 5 tests fail