add Long tests
add low watermark and high water mark on expiry for performance.
Multiple refactor and more metrics