Stop clients hanging in tests.
Add a layer for redis store based tests.
Use new layer (decreases test duration).