Update tests

Fixes:

* bug 825655 - tests broke after Andrew changed the flow -- this fixes that.
* bug 825658 - extended the test so that it covers the first sync, too.

These are test-only.