Sync - refactor test