Align tests with new SDK