merge call limits into api client, with tests
remove call limits from old client file