changing phoneNumber to phone and adding support for firstName + lastName. updating tests.