rate limit handlying and tests
clean up