Fold test_participant_model into test_participant

The second test file sprouted when we half-ported to SQLAlchemy.
Fix remainder of participant tests
More or less blindly fix up associate and takeover