Congratulations! You are correct!
2.
A. On the day of graduation I found out, that I was not going to be valedictorian after all.
B. On the day of graduation, I found out that I was not going to be valedictorian after all.
C. On the day of graduation I found out that I was not going to be valedictorian, after all.
D. On the day of graduation I found out that I was not going to be, valedictorian after all.