Clean up other test cases.
Remove TODO comment.