Improve svg and util test coverage