Fixes site data product tests
Removes desprecated test
Merge pull request #2196 from lukecampbell/cals

Brings the build back to green