more test shapes, comment fix