catching up on sync
 Updated tests