Fix Remaining SDK Tests