Add urlparse wrappers, unit tests
Fix #1: cleanup