Add tests for reference sites.
Incorporate fbricon's p2 check of discovery site urls.
Still need some cleanup.