fixed legacy data to not include django sites, and updated tests for recent commits (bad, bad ben for not doing this earlier.)