removed tests, improved sync on error