Fix suite/cmd line test merge logic