Sitemap improvements and unit tests