Add array declaration and add more tests