FieldSetContainer now stubbable + test