Merge "Minor test style update"