Added some more unit tests and fixed some CommandLineFile issues.