Adapt existing test to expected output with merged traces
Handle exceptions in comparing trace names and favour markers over lines