Refactoring fixes based on code review [KFSQA-1029]
[KFSQA-1011] fixed 'null' delivery phone number and correction to favorite account check
[KFSQA-1046] merged from master