Applying limits and offsets to support each, updating tests