Cosmetic fixes, debug-test bugfix
Cosmetics: namespaces use syntax
Cosmetics: line wrap added in output
Tests: temporary file unlink at the end added