Enable url tests
Add support for --url
Formatting
Remove old crap
Add support for options-path
Minor formatting