No longer using deprecated field tagging in tests