Enhance test coverage and bugfix
Update the CTRLF option
Enhance test coverage