Added ability to specify DatabaseURL

- Refactored makeStore method into makeStoreWithDatabaseURL method.
- Moved old makeStore database URL generation code into makeStore
  method to preserve backwards compatibility.