Fix bug and easier configuration of TestSync