(PUP-3222) Windows service integration tests

Additional changes / integration tests for review
Yeah, sorry.. I'm always mixing up V1 vs V2 syntax.  I used V1, but you're referencing V2.  Thanks... will fix.