Merge "Backfill atom tests for new event metric format"