jeffjiang: modify test outputs to conform with code convention