Fix tests for SDK 6.x, 7.x