Fixing up SmartSync tests, errant code

Nice! We should do the same for ```Android```.