Added 2D test