Fix tests for Leo change
Fix tests for Leo change