Refactored base URLs, fixes #1 and issues with unit tests.