Fix suite/cmd line test merge logic

/cc @seancribbs