more tests; fix parsing multiple cmd: lines
fix merge