Update tests to work with endpoint heuristics branch

Needed for https://github.com/boto/botocore/pull/309