some small changes in API and sync testing