Fix comment
Add test case to check remaining buffer