Added Sync Tests support