fix test and add todo note.. 02:44 =(