Fixing up SmartSync tests, errant code
Merge pull request #835 from khawkins/fix_smartsync_tests

Fixing up SmartSync tests, errant code