Sync support

and test updates