Revert "changed rectangles client side implementation to be only a "marker" for draw stuff" and extended RectangleTest.

This reverts commit a7640fea97db65a4a0319cfb044c8cea471bfb6d.