Multi-dimensional array parsing + more tests