Remove duplication and add clarification in tests