Merge "Add a test to confirm that TZ data is in sync"