refactored m2m
making tests run on contrib auth