Merge "Add test for ThrottledError exception"