fix phone-number module/import for test runner & refactor/cleanup