Updating test case and removing @todo