Didn't your motorcycle safety course give you your M2 qualification when you graduated? Most courses include the M2 test as part of the program. Perhaps you still need to find an M2 course.
After I had graduated my course, I had to finish the waiting period on my M1, 90 days, I suppose, then just take the paperwork from the course to the testing centre to have my license upgraded, with no more tests.
I got insurance from TD Meloche Monnex after my course, while I was waiting out the waiting period to upgrade from M1 to M2. They simply requested that I upgrade my license ASAP, and let them know when it was done.
I am probably older than your parents, though, and have been driving ever since I was old enough. Since you are 25, I don't expect that your age would count against you.