Fixed some code issued by lint warnings.
Added instrumentationTest for CommandLineFile.