Fix error handling.
Add label (test url) to data set
Fix naming.