Fixing up SmartSync tests, errant code

Yep, I will look at the Android side tomorrow and make those changes.