Are there Slide Master Placeholder Limits for Question slides?

So Eric, 

This doesn't solve my problem. Inserting a regular text box on the master slide doesn't make it a true placeholder; I cannot edit the "test 1" or "test 2" boxes without going back into the master. (You actually demonstrate that in your screencast, I just didn't catch it until I tried it myself)

I want/need to be able to have more than 2 "Text" placeholders on my master slide so that I can always have them when I want to apply that layout; it shouldn't matter if I am applying it to a quiz slide or regular slide. See the content library screenshot example for the "look" I want to achieve in my layout (however, on the content library template, those 3 text boxes are on the base layer and not the master)