Unit test sync
Implemented #110