Reestablishing, and adding more comprehensive tests for, syncing foreign users who are actually also local users