Basic array checking
Fixed a couple issues with array testing
Merge branch 'master' into file-error