started refactoring test models
Refactored M2M tests