Fixing up SmartSync tests, errant code

Another test consolidation.