ShapeTest and AbstractTest Updated