Removed last traces of ShapeTest(R.I.P. forever)