Fix tests to work with SDK 0.33.