us5976 - fix Odin tests