Updates to workarounds, tempest

Change-Id: I7768123206840b088b80c3f279e0ec88bc40a205