Added rectangle and figured out acceptance test