updated primitives removed fields
updated rectangle test