Fix show and add tests