Fix tests for SDK 0.8.7.0