fix right thing and restore old tests for synchronization