Re #1165 - another attempt to get test naming working...