Clauses of time and consession - help

Can anyone help me with this exercise, am I right about it? If there is necessity, please correct me. Thx in advance.

Clauses of time and concession.

1. When he got the phone call, he left immediately. /moment/
He ...... the phone call.
He left the house the moment he got the phone call. //my version (?)
2. We can't leave. We have to wait for the rain to stop first. /until/
We can't leave ...
We can't leave until the rain has stopped. //my version (?)
3. We can't go. We have to wait for the taxi to arrive. /until/
We can't go ....
We can't go until the taxi arrives. //my version (?)
4. The plot was complicated, but I enjoyed the film. /though/
Complicated .... , I enjoyed the film.
5. Not until they leave will she begin cleaning the house. /start/
She will .......
6. In spite of the train strike, she still managed to get to work on time. /succeeded/
She ..... there was a train strike.
She succeeded in getting to work on time, although there was a train strike. //my version (?)
7. This test is very difficult. It is very tricky.
Difficult though this test is, it is very tricky. //my version (?)
Although this test is difficult, it is very tricky. //my version (?)
8. The lesson was boring. The students continued to stay in the classroom.
In spite of the lesson being bored, the student continued to stay in the classroom. //my version (?)

Insert correct form of the verb:
9. As soon as they (see) ...... the river, the children will want to bathe.
As soon as they (see) ...see... the river, the children will want to bathe. //my version (?)