Better model class cleanup between tests