removed unnecessary tests
and add todo