remove to do tag and fix test case