Sync some tests with eventually