Fix tests for changed API
Update examples for changed API