Use better names in tests