Fix unit tests for the new --lines and --merge flags.