The combination of tenses in time or conditional clauses may be totally different in Spanish and English, that is why students need repeated practice. Here is some help:
Exercise 1
Exercise 2
As soon as you finish both exercise, you'll be ready for the tests!
Exercise 3
