test: cleanup sync test code

Pull up helper methods. The goal is to focus on the things that affect
the outcome.

Not a big fan of DRY in tests, but the state manipulation was getting
too cumbersome.