Fix contributor_display & add more tests