Keep timestamps in sync
Fix test error for new behavior