- clean up logic around test for array type

- short term fix until #460 is implemented
Fixes #458 #459