Fix conflicts between tests