convert TODO to a comment
update test numbers