Making test naming more consistent