Start fixing output to match test.
Handle contributor name according to standards.