Fixed a few tests.
Merge remote-tracking branch 'upstream/dev' into disable-array-connects
Merge remote-tracking branch 'upstream/dev' into disable-array-connects
Merge pull request #1421 from crobinsonut/disable-array-connects

Disable array connects (fixed)