Fix tests
Merge
Tolerate 3x response codes