Tests upgraded for TWM.