Fix tests for Leo change