Improve svg output (update unit test)