Merge changes I3b7913c5,I9c1d6294

* changes:
  Improve error reporting in RateLimitTest
  Add null checks to RateLimitTest#tearDown improves error reporting