Issue #2350215: Removing redundant (and possibly problematic) code in setup of field collection tests