[#1665] Make test names a bit clearer