Fixing up SmartSync tests, errant code

I took out the "gold file" comparisons, as they're too unwieldy to manage.  Trying to focus more on data that's determinate within the run.