Add to Integration test and fix ConcurrentModificationException in SerengetiLimitTest