Fix tests for Leo change: t+
Fix tests for Leo change: t+