Removed special formatting of endpoint url
Tests for services & endpoints
Merge branch 'batch-9' into dev