Fix tests for the new core changes for field names

Fix tests for the new core changes for field names, this should fix obvious test errors.