Fix to base url and tests
Small cleanup