tweeked tests and request to handle country code