Develop

This code is duplicated not only in this change but also other existing tests.  I feel the tests needs a util class for clearing Redis.