Implement changes in CommandLineArguments & add test
Implement CommandLineTestRunner

Also remove temporary workarounds from CommandLineArguments