TGM: Fix tests