Cleaning Up CFile

Incorporating the changes in PR #2596 
I tried that approach, and it also passed all the tests. I just kept the dummy ones considering that whoever wrote them, must have written them for some reason.
IMO, It may have been written for debugging the the class, maybe.