Updated/fixed sync tool for selftest