Fixes broken test_granule
Merge pull request #1555 from lukecampbell/testfix-r2

Fixes broken test_granule R2