[WIP] More fixes to both tests and synchronization process.