Updated tests as the number of fields have changed