Add url to storage, fix builder
Add small tests