remove TODO which was tested