Changed test image, Little bit of cleanup