Improve rate limiting and tests, for #80