Bug fixes for full sync and a few other data sync cases

This passes the data sync tests that are updated to
handle full sync now.