Some test naming improvments