Merge "Add traces to explain test failures"