Added fields to test