Change controller and test to accommodate new 5-digit phone codes
Merge branch 'AB-test-incoming'