Cleaned up a bit.
Added specs to test addShapeToCollection().