After fix for NTTable extra fields not being created was merged, unit tests failed. Tests were wrong. Test was checking number of fields of constructed structure against number expected without the extra fields. Corrected check and added checks for extra fields.