Fix circle() shape function tests and add new tests. Remove rectangle() ...

...tests after removing rectangle() from the spec.