Merge from Herb. print correct test status