Added 2D unit tests