Merge "Add a test for new-style container-sync"