Improving tests
Adding array support