First conditional and future time clauses

I'm going to keep working until I have finished. / I'm going to keep working until I'm going to finish.

If Tom has studied, he'll pass. / If Tom had studied, he'll pass.

I'll pick you up unless I have to work late. / I won't pick you up unless I have to work late.

Buy 2 extra in case John and Mary will come. / Buy 2 extra in case John and Mary come.

She is going to help me as soon as she can. / She helps me as soon she is going to be able to.

You can go out as soon as you will finish your homework. / You can go out as soon as you finish your homework.

Hurry up or you won't be late. / Hurry up or you'll be late.

After I go shopping, I'll go to the doctor's / After I'll go shopping, I go to the doctor's.

I'll call her back when I've got time. / I'm going to call her back when I will have time.

I'll take my charger in case I run out of batteries. / I take my charger in case I'm going to run out of batteries.

Don't call me unless there is a problem. / Don't call me unless there will be a problem.

If you go out, remember to take your umbrella. / If you'll go out, remember to take your umbrella.

If we are lucky, we have sold our house by November. / If we are lucky, we'll have sold our house by December.

If he is coming to the party, I won't go. / If he is coming to the party, I go.

Don't call him now because he will study. / Don't call him now because he'll be studying.

If it's raining tomorrow, I'm not going to go running. / If it rains tomorrow, I'm not going to running.

She's going to get a summer job before she will go to university. / She's going to get a summer job before she goes to university.

If you aren't feeling well, don't come. / If you haven't felt well, don't come.