Refactor baseUri
Add tests for baseUri