Add tests for Phase 3