+ Small comments.
Fix broken test case.