Merge "Add extra unit tests for base_url"