Finished test 7, added changes to TwoDShape class that reflect shape name consistently