add 2D tests