Use more consistent naming in tests