Some small fixups and rearrangements to previous commit#732

jafingerhut merged 1 commit intomasterp4lang/tutorials:masterfrom

ptf-test-fixupsp4lang/tutorials:ptf-test-fixupsCopy head branch name to clipboard