Add coverage for unittest coverage
Minor formatting changes
Ensure domains and paths are decoded to utf-8