Merge "Fix func. tests utils base URL generation issue"