More tests, add array support