fix phone-number module/import for test runner & refactor/cleanup
Merge pull request #1094 from wilmoore/fix-phone-number-for-test-runner

fix phone-number module/import for test runner