Address functional test and customer login refactor