Add shapes to test