Added missing error block to test.
Fixed resolving of includes for arrays.