Fixing up SmartSync tests, errant code

Consolidating into one test.