update test numbers
remove code related to DISPLAY_FieldSet (they are now added as child
objects)
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'