Merge "Align tests with new SDK"