fix synch & tests