Phase 2 tweaks testing