Fix minor error on draw2d. Remove useless utest. Fix issue with raw version