Added material property in shapes, and in tests!