Adapted TestResults and their merges to be more semantic