Fixes for soak testing (changing keys)