Refactored RELATED M2M tests