Improve naming in tests.