Fix Customer location section to simple text fields and fix tests