I think there are more places we should be using mocks with pre-downloaded sample data rather than actual API calls in the bulk test functions.