FIX: rolled back some unit tests changes after reopening of wish #734.