Re: API and unit-tests URL adjustments