Fix tests
Add sync_tools + minor updates (.extend -> += )