Sitemap to provider mapping re-instated, and the test which fails under
Gradle excluded from Gradle test.  JUnit tests all green except 3 known
incomplete.  Demo app is OK.