Added 2D and 1D test cases