Phase 2 Test Fix