Merge "Changing urls of testapi api and resources"