Add positioning for rectangle
Update tests