Add Rect and RectTest class