some refactoring in commandline tests
added some failing tests, commented out, marked with TODO comments