Phase 4 testing errors fixed