Cleanup: more test naming tweaks.