Merge "Remove redundant assertIn('id', xxx)"