added todo test and commetns