Hi:

You can practice with these exercises to reinforce the future tenses:

• http://www.better-english.com/grammar/willgo.htm
• http://www.englishexercises.org/makeagame/viewgame.asp?id=3135 
• http://www.englishgrammarsecrets.com/goingtoorwill/exercise1.html
• http://www.englishgrammarsecrets.com/goingtoorwill/exercise4.html
• https://elt.oup.com/student/solutions/preint/grammar/grammar_06_012e?cc=global&selLanguage=en