Fixes & improvements for soak testing (changing keys)