Unit test updates
Fixed gauge problem due to interleaving SET and EXPIRE calls