Correcting issue with identifying shapes and adding test for shape identification