Fix tests for latest SDK

Hope this helps!