Merge "Fixing unused param warnings in sync_test"