Fixes to sync unit testing to enable test datasets to work across all 1.9.x releases.