Modifies spec test to use new fields and remove old fields.