Add specs for other shapes