refactor for cmd-lin tests