Fixing up SmartSync tests, errant code