Patch Set 2: Looks good to me, but someone else must approve; IP review completed

Duh. Not sure why I did this here. Of course this is the proper solution (I have replaced the literal with a constant, though). Looks like there are a lot of other tests that I'll have to check, too where wizard pages are involved. On those wizard pages, I wasn't able to find the buttons by their label, so I used the button(int) pattern a lot.... Or are the tests fine there?