Changed output format and associated tests