Added two additional shapes
Added content to the very first test