Correct comments + add unit test