I didn't look too deep for more context, but the idea of the test data having None as sync options is slightly concerning given the amount of issues we've seen in this area. Should we be testing with data here and then verifying it's put in the right place?