Fix tests for new botocore