Switched dynamic field test files to the object manager.
Switched email test files to the object manager.
Merge remote-tracking branch 'upstream/master'