Merge "Make test always pass when command fails" into tm-qpr-dev