Added new shapes to test