Merge "Do not verify field count in tests used in CTS"