reorg/tempest: adapt to new settings

Change-Id: I81fc57dad960290d95ad2e7f373b4e32672dd577