fixup! eb2bab37
fixup! 3e3e847c
server: further logic changes to sync method
tests: ensure multiple versions