Added ShapeTest.java & BitmapTest.java