Refactoring - separated trailing slash (/) from baseURL & updated affected files
Fixed test from refactoring